Ro 6.25.0 review/fix

Merge into master for next release