DC21-588: Fix scope which cause migration errors
Merge remote-tracking branch 'origin/master'