Merge commit 'd7dbc687e312a91ef2ccf797d57b95c61d0e8a2f' into release/1.1