Fix pump crash
Fix tile marker crash
Merge pull request #1852 from Prototik/pump-drain-crash

Fix pump crash
Merge pull request #1854 from Prototik/tile-marker-crash

Fix tile marker crash
Merge branch '6.0.x' into 6.1.x