Simplify/fix custom duplication of the data and locks for all instances
of the same PR