Main release

Merge stable code from Main Release into Master branch.