Fixes for R3.6 Release