4.8 commit

Likely temporary faction hostility changes