Merge branch 'bc/solaris'