Issue #272: Complete
#272: Fix for cl config overlay