1.0 release merge into develop