Bug-368: Issues with sentries + implementation of ideas.