update from core (reverted from commit 9a85ddad5538af4310ff2a68fa1ac7d29d67c143) (rollback core to just before LocationType changes)