Merge branch 'main' into 2097-unused-function-getattackfortcxdecision_fx