UNCLASSIFIED - NO CUI
Release 2.x MR, all of these changes were already MR-ed into the 2.x branch, this just brings them back to master.