Merge branch 'activate_643_switch' into 'main'

[ref-using-main] Resolve "PCA bypass command-line option" - Part 2: activate switch

See merge request !1214