(cherry picked from commit 16da53707f) Conflicts: app/inc/constants.php.template app/inc/init.php
16da53707f