LPS-45880 Update all inherited handlers