BZ-8668 portfolioService