LPS-33083 Change service implementation accordingly and apply changes
LSP-33083 Change upgrade process
LPS-33083 Autogenerated