adjusted to enable permanent staging instance access control
Merge remote-tracking branch 'origin/master'