merge of 'c1f56760bf109a8b713045831bca0044ccd1d481'