bugfix for indexing user def props on import
Merge branch 'master' into catma_api