[#68530218] Rewrite references