Merge pull request #287 from PrismorSec/feat/explicit-enforce-selection-and-self-edit-unlock