Followup to task #2204255 by ezra-g: Include recent Core & Views node access patches