Bring 1.0.2 bug fixes and changes into the develop branch