merge of '434c9b83795714321c5e83703daa92ea144962c8'