Merge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1