Merge "Clean up binding list on error" into oc-mr1-dev