Merge 'portfolio-implementation' branch