DDBEASY 216 - WYSYWYG formatting corrections.
Merge remote-tracking branch 'origin/DDBEASY-216' into development