APIM 8631-revert old commit and add null check for security config#10656