Merging in latest L4 changes
Finishig up basic page resource