Taken from issue 937, where mesh-catalog #335 was taken into the issue and issue 943 was opened for a fault in other code.