Merge "ODL script bugfixes"