Merge main into isar_lcld_crash_codec_fr_LT_isar_fr: resolve options.h...
Merge main into isar_lcld_crash_codec_fr_LT_isar_fr: resolve options.h conflict by keeping all fixes
Merge main into isar_lcld_crash_codec_fr_LT_isar_fr: resolve options.h conflict by keeping all fixes