backport code complete
Merge branch 'develop' of github.com:CodeBrew-io/Frontend into develop