Merge "Add a configuration retrieval manager." into pi-dev