merge of 'b384c5e2d3593861ccd01660d94e43bb59e544f5'