Update to prism master branch