Merge tag '0.9.7' into develop