LPS-51468 Check on every request so we have more immediate feedback
LPS-51468 Regen
LPS-51468 simplify