Merge "Fix check causing wtf log in  ModesTileMapper" into main