Markup support for framework

Change-Id: Ia5ad6cff7593c295944a90775a1b061c95f5cc3f
12 files changed