Merge tag '0.9.6' into develop