Merge "Application properties config change"