Catchup from Rutland changes
Remove hardcoded "opdata"
Catchup: rutland dev