Merge "Rehome functions to enable Neutron's placement integration"