Dev Charlotte Branch Pull Request

Requesting to pull  Dev - Charlotte into master.