In 0c73297c I made some changes up to 9 for 20.03 and master, now I do the same for 10 which is just on master.