fix solr updates
Re-generate assets
Merge branch 'master' into as28_11981_narlabs