#4137 RO Tweaks