Merge branch 'develop' into 0008-old-warn-fix
autocomplete add fix
Merge branch '0008-old-warn-fix' into develop