refactor(all): compatibility for 3.2 core (refs #4982)