Updated edit protection code for personal
Merge remote-tracking branch 'origin/master' into rr-2