Feature/us7619/ta17538

Matt, this pull includes the deployable files