Add IT-related changes pulled out of PR #12368 (#12673)