Brought over v0.2.12 for taskmaster