Merge 2.6.3 release changes into master

Merge 2.6.3 release changes into master