Merge remote-tracking branch 'origin/feature/12247-replace-lists-of-if' into feature/stretch (Closes: #12247).