refactor(core) 3.1.x#561

XTRO123 wants to merge 11 commits intoevocms-community:3.1.xevocms-community/evolution:3.1.xfrom

XTRO123:3.1.xXTRO123/evolution:3.1.xCopy head branch name to clipboard