Fix draft rendering
2.4.2 release
Merge branch 'dev'