merge of '4d056d24e9fd51cc15a2cafe9af79d82160d469c'