Issue-ID: VID-889