Refs #10408 Fix the build
Merge branch 'feature/10408_autocomplete_tweaks' into develop