Merge pull request #1896 from shackbarth/peg-lockdown