SOme stuff on master before 5 and 6 are merged