Fixed flickering issue for the edit protection
Merge remote-tracking branch 'origin/master' into rr-2