DEVFORUM-110: apply changes to ContentImporter