First steps towards issue 6785 (run to this line)