preserve external markup classes fix
Merge branch 'develop'
latest build