Updated to development version 0.9.9
p4#: 21323