Merge branch 'release/r20' into develop
pascal photo fix
Merge branch 'release/r21'