Re #7497 A little formatting so we can read the *%#$%@# code
Merge branch 'feature/7497_move_offspec_to_api2' into develop