LPS-45880 Update all inherited handlers
LPS-45880 S/F
LPS-45880 SF