update not create issues
Merge branch 'master' into search-api