Merge "various fixes:" into lmp-dev
tree: 220f20ddb7f940cfb47022aa682370402a5758a7
  1. service/