Updating dev_Richard with latest from master