LPS-30678 compat
LPS-33418 - Backport

LPS-33418 - Source Formatting
LPS-33418 - Regenerate
LPS-33418 Source formatting
LPS-33418 Keep old service.properties number since it was recently incremented already