Added tagging / untagging flag. Can spawn checking.
Merge commit '5f4847f5e847d71077c6ed0b8d9b94e878cc115e'