LPS-46451 Properly unregister TableMapper
LPS-46451 Regenerate