Merging release 0.9.7 from master to dev