Merge a few more stable fixes into ROAMS stack