Add support for multiple service instances
PR: 195698 Submitted by: Igor <arabesc@bk.ru> Approved by: maintainer