The latest changes, merged another pull request after resolving merge conflicts and IZPACK-921