Adding automatic task argument parsing per fee10373cc812a4b2955a0cefe96b6b6993a8099 upstream