Quick Map switch
Disabled quick map switch
Merge remote-tracking branch 'origin/aside'