Revert "Revert "Merge branch 'develop' of gitlab.com:octopus-code/octopus into develop""

This reverts commit 2d34e2ff.