Merging release 0.9.6 changes to Master