Issue-ID: VID-484