5.4.2
fix: CR suggestions
Merge pull request #16372 from Cuiyansong/master
fix(stack): revert pr #17809
style: using utility methods for type checking.