sara photo fix
Merge branch 'release/r22' into develop