Merge branch 'jk/maint-soliconv' into maint