Updated to development version 0.9.11
p4#: 21511