Merge "Set up compose (2/3)" into main