Merge commit '8575f5362f98c937758b20ff8512d6767a56208e' into release/1.1