Merge "Addresses lp#942382 - refactor configuration for clarity"