Merge "Update usage of PropertyMap::load"