BACKLOG-993 add support for ACS index
Merge remote-tracking branch 'origin/BACKLOG-993' into develop