Issue-ID: RIC-149