case 2416 - Fixed autocomplete issue.
Merge branch 'case-2416' into develop

* case-2416:
  case 2416 - Fixed autocomplete issue.