Merge branch 'mtjandra-IZPACK-1071'