manual merge of master into ngale