[REFACTOR] Merge branch 'master' into typo3-development

* Sync both environments