Merge from 5.3 branches as well as the last CGB commit in svn