Merge from Development to Master

Merging the 17 commits from development to master branch.