bug #24098
Bug #23491 fixed. Loading spinner added to map