Master ... release

Merging new changes from release back into Master