NRTG change to get StoreByForeignSource working