Sentinel support

Was #452.