Merge changes from McNeight:master into DRO:master