Expanding the conditions under which the new location-role logic gets triggered.