Merge "Add config option to enable/disable pause workaround." into oc-dev