Merge of latest changes in Develop

Re-synchronizing master with latest stable code from the develop branch.