Merge of master branch - chore(release): 0.9.7