merge of '2ca643ff7c613da29d4b700344b527b73f2000f6'