solved with link logic
Merge branch 'release' into solr