Merge "522277 - [REQU-80] Referencing" into dev