Updated to version 0.9.6
p4#: 21297