#4137 More RO Fixes