Upating Solrizer and OM
Merge branch 'updates'