Merge branch 'Issue-2369041' into 7.x-1.x
Issue #2370609 by dave.ingram: Adding an alter hook for page context
Merge branch 'Issue-2370609' into develop