Merge branch 'master' into Iss#1643