[chirp_devel] Patch for issue #4031