Merge "Fix issue #16907799: Processes containing bound services..." into lmp-dev