merge of '7393275c6ccce67cadeb49d4afb3459e56edf8a9'