Merge "Rework configuration"