Patching back into 2.0.4 master release a couple of important updates.