Merge branch 'OCF79-prepare-code-for-hackfest' into 'staging'

Resolve "Prepare Code for Hackfest"

See merge request !68
in 3 minutes and 13 seconds, using 0 compute credits, and was queued for 1 second