Merge "Rework config"