Merge: from buildcommand_allocs - Bugfix for enable_marker_teleport teleporting to wrong Z Tests: unit tests + enable_marker_teleport