Merge branch 'pruss-fix' into fixes