Merge branch 'features/JAL-793_Embed_data_HTML' into develop