Merge branch 'search-limit-offset-type' into 'develop'