Merge the convict PR