Merge branch 'main' into 2106_basop_several_small_code_improvements