Update to DIST_PRCP removal; includes merge of more recent commits from other development.