Embedded styles and scripts are embedded again
Add unit tests
Merge branch 'feature/platform-3589' into develop