MFV less v691
Approved by: re (cperciva)
Relnotes: yes
(cherry picked from commit dafba19e42e78cd3d7c9264ece49ddd3d7d70da5)
MFV: less v692.
(cherry picked from commit e2abec625bf07c054f7ac2df2402d6c454113df8)
(cherry picked from commit 423b0bc492d5264ee518c6569d3c90ee0efb338c)