Merge branch 'feature/quack' into 'develop'