Merge branch 'shivammathur:main' into main
Fix adding fallback mirror for PHP PPA [skip ci]
Improve build process