Upgrade to 6.02.1RC3
Merge branch 'upstream'