Merge branch '942-default-location'