Merge "Rework on simplified local setup"