Ready for SDK v2.0.4