DB-8819:  "Lock to peak" fixes