Issue #323
Merge branch 'feature/abstract-configuration-and-enable-mapping-flag'