Enhancement #377
Merge branch 'remdex_dev'