Updated to development version 0.9.5
p4#: 21276