Adding popup compatible loop-protect
Adding popup compatible loop-protect
Merge branch 'scripted/upstream/fix/loop-prompt-2' into scripted/upstream/master-integration