Merge branch '1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT