Merge "Fix issue #62524613: Background limitation is not working as expected..." into oc-dev