Merge branch 'fix/add-likes-index-objects' into 'develop'