More preparation for 5.1.2