Merge branch 'main-pc' into 1567_basop_empty_dirac_param_bands_at_high_br