Merge "Explicitly include Configuration.h"