Merge commit '80c268eaaee402695a74d14acf76063100692a99' into release/1.1