Refactor sentinel attempt implementation (merging from a branch)
Refactor sentinel attempt implementation (merging from a branch)

Minor changes following the merge too.

ZeboFranklin/tal,joeyjojo/tal,ZeboFranklin/tal,joeyjojo/tal,joeyjojo/tal,ZeboFranklin/tal,joeyjojo/tal,ZeboFranklin/tal,joeyjojo/tal,ZeboFranklin/tal