Merge branch 'bug/phpinfo-accessible-hotfix' into 2020.09-rc