Merge branch 'refactoring-controllers' into angular-migration
Merge branch 'angular-migration'
Fixing map reset issue