replacement table and field map remove from database type dependent config and went into EngineConfiguration
Merge origin/master