Add floatation vest and associated logic.
Merge remote-tracking branch 'origin/pr/1979'
Signed SIGNOFF file