SITE-387: Stabilized resolving references