Merge remote-tracking branch 'refs/remotes/origin/feature/Powershot' into develop