Merge commit '8d7839fc7c52574dfc22db0181b1cef9cb929910' into release/1.1