7.0 fixes branch mat

diverse fixes to check on the runbot, please ignore