Check-your-six feature

placed in a separate branch for collaboration. This branch is split off from dev @ ed8ec4b0181723afdc8bc6d5f9991c727570dc79