Merge "Enable restBaseless rendering"