Merge master into beta for work on new features