[chirp_devel] Patch for #5595