Fix #112
Merge branch 'fix-handling-of-pagedsize-for-related-context'