Merge branch 'local_R3' into R3_development