merging 'DEVELOP-R' into 'MASTER' aftermath

there were some merging error in the first step so these are the fixes
that should cover them