Merge branch 'develop' into embeds
CSS adjustments for avoiding scrolls + embed test page
Merge branch 'embeds' into develop