2.20.5.152 sample fix/preparing to remove CHARCOAL_BASE_DIR