Merge branch 'abstract-page-from-net-stack'