Merge pull request #5180 from gmjw/secondary-y-shared

Merge pull request #5180 from gmjw/secondary-y-shared #347