Syncs bug fixes with newer IG2 version