Merge branch 'feature/developer-mode'