merge of '21f8954c91db09af224e09720b99300cf59e6c65'