UNCLASSIFIED - NO CUI
Currently supported Big Bang Version is 2.38
cherry pick 1.47
Closes #1352 (closed)