merge of '41daabd524e84d8b355abb1ef7c1d06479c25b7d'