Merge branch 'rkrell-IZPACK-1084'