Current Release Merge

Merging Beta branch with Master.