Merging release 0.9.9 from master to dev