Merge "Decouple configuration from application"