Merge from bigs and added faction notifications.