Merging release 0.9.12 from master to dev