Sentinel support

Was #452.
My bad. I'm dying to move on to 4.0 :)