Merge "Fixed index passed to handleAssist()" into qt-dev