Jrouge/wfu 4025/wilt thou be gone airbrake be gone dont stay and die 

This is a sub pull request.