Issue #1614456: Migrated code from patch and fixed the test as well.

Saurabh Vijayvargiyarequested to merge
issue/token-1614456:1614456-current-pagequery-should-fall into 8.x-1.x

Closes #1614456

Merge request reports