Re #940 - Moved configuration to corelib
Merged conflicting commits