Merge "Issue-ID: VID-484"