VG-872: This task is been renamed and split into two tasks.