Modified to get the markup for component from page x-template script tag.
Merge remote-tracking branch 'refs/remotes/origin/master'