Merge branch 'hotfix/on-site-pilot-fixes' into develop
Merge branch 'release/0.9.1'