Merge commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54' into release/1.1