Merge remote-tracking branch 'origin/main' into basop-2588-condition-seem-missing-in-lsf_dec