Merge branch 'from/develop/tusooa/2758-gin-index-search' into 'develop'