Release/0.9.7 to Develop

Merging back changes...