refactor(Updates around foreign ref checks):

refactor(Updates around foreign ref checks): #1872