Merge branch 'rio-5.0-M4' into rio-M4-S7