Merge squash RndReferencing into rnd-internal-api