Merge "Fix issue with deferred start of the background loader." into oc-dev