r26232 - Locket fixes by @gausie in

Top