Merge branch 'page_evict' into dev