Merge branch 'R4_7_maintenance' into BETA_JUNIT5