Some more updates regarding the on-site pilot!
Merge branch 'develop'