US77540 Improve embedded pages to work faster
US77540 Small code review fixes
Merge pull request #39 from roadhump/feature/us77540

US77540 Improve embedded pages to work faster