I think it makes more sense to merge oop into dev and not the other way round. Because I changed some namings (files, functions, ...) in oop which are the ones that should be preserved. @m.hock it is sufficient if you approve the MR and I merge it afterwards, if it looks like something's going to break.