Work on 5.1, see changelog