Merge remote-tracking branch 'origin/prgn-inclusioninherent-provideinherent' into prgn-custom-proposer