Merge "Added support for Wipe Task"