Updating master with nau-master

Updating master with nau-master to start cleaning up