Merge pull request #2226 from magumagu/restore-wpar-mask Restore masking to gather pipe address checks.
