MAL-59 | Restore pager
Add feature context