Feature x into dev

The feature branch has been testing with the latest changes on dev and is ready to fold back into the dev branch.