DEV-50173 - Text Composing is broken
Merge remote-tracking branch 'origin/master'