Merge "Fix issue with configuration update check." into oc-dr1-dev