SRs to work on:
Depends on theia Caddy removal
This will create a new commit in order to revert the existing changes.
