Merge changes from 5.0.0_r2