Embed UI fixes
Merge branch 'release/v2.0.14'