Issue ID: RIC-791