Merged changes into R2.1.2