Next button call on InitializeMap
Merge remote-tracking branch 'origin/master' into Keys
Merge remote-tracking branch 'origin/master' into Keys
some const added for keyManager
Merge