Merge branch '1.39.0-cherrypick' into 'master'

Package Merge Request

For Issue

Closes https://repo1.dso.mil/platform-one/big-bang/bigbang/-/issues/1248