Fixes for R3.6 RC3 release