quick hack to make the Mesh block work #2656
Merge commit '225a2c78ed2c46062d6490f96c680a6500124090'