LPS-51468 Check on every request so we have more immediate feedback
LPS-51468 regen
LPS-51468 compat