re #10666 Improvments ready for test