FLEX-34216 accept patch from Mihai Chira
FLEX-34229 accept patch from Mihai Chira
FLEX-34013 - scrap is always plain text at this point
Merge branch 'release4.12.0' into develop