Charcoal can be used in bonfire
Merge remote-tracking branch 'refs/remotes/origin/master' into unifieddyes_cotton