[chirp_devel] Revised patch for #8339