LPS-36287 Forgot @Override
LPS-36287 Remove exception that is never thrown
LPS-36310
LPS-36310 Regen
LPS-35951 SF