Big Feature Request - Substitute Reference Objects for Reference Locations

RH-65165 is fixed in the latest WIP