merge of '54b3dda1df013d6327e2ce8df95d7cfeeac2fbae'