Merge branch 'main' into 2142-implement-basop-w_min-and-w_max-functions