fixes-bug 123456
not-a-regression 123457