RAYO-86 : Merge Ameche branch

Changes to support the ref element on moho remote.