merge of '2d0e7ded96559d4c71de1153762dd0879fa16697'