This updates to commit f3c92e90dcc0d65322888217429b75dd101bd0d3
Based on what we added to phoc recently