Updated to version 0.9.4
p4#: 21275