IZPACK-912 (after resolving merge conflicts), IZPACK-921

IZPACK-921 is too trivial to make a separate branch