Merge branch 'main' into basop-2508-harmonize-getattackfortcxdecision