BZ-9200: improvements to portfolio pg