LPS-33270 Change to staged model handler
LPS-33270 Apply
LPS-33457 Tests