UNCLASSIFIED - NO CUI
Currently supported Big Bang Version is 2.40.0
Cherrypicks for 2.0.0
Closes #1467 (closed)