LPS-33647 Altered handling of terminal states in Definition
LPS-33647 Source formatting
LPS-33258
LPS-33258 Regen