refactor(all): compatibility for 3.2 core (closes #4982, #3039)