#1205: #1112: last changes to charcoal

opened by njr2128