Merge "[CDM] Fix BAL hardening issues" into main