Merge branch 'main' of gitlab.e.foundation:e/os/apps