Updated to development version 0.9.7
p4#: 21299