Merge remote-tracking branch 'origin' into basop-2493-usage-of-extract_l-with-values-out-of-range-2