Merge remote-tracking branch 'warped-rudi/cubox-stable' into development. Closes #50