merge of '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'