Merge commit '146b187113e3cc20c2a97c5f264da13e701ca247' into release/1.1