LPS-39448 Fix upgrade
LPS-39448 More code, but follows existing pattern
LPS-39448 Regenerate
LPS-39448 SF