Merge with latest PBO