Fixing issues introduced with new commands adding index Upstream-commit: 80469f8180506b8e3a04e63766b15caddffa9726 Component: engine