Backport #7751 & #7763 to `release/2.12.x`

Since KIC 2.12.x is an LTS version, the recent fixes #7751 and #7763 need to be backported to `release/2.12.x` branch. There was a significant refactor on the translator code from after 2.12.x, so the backport may not be easily done. The issue is used to track the backport of the PRs to `release/2.12.x`.