Merge "Added support for flash task"