Merge "Remove accidental debugger wait." into oc-dev