Revision update
Merge branch 'release/r3' into develop