manual merge of 7ec32cc

Merge commit '7ec32cc'