IAIS-5: encoding fixed
Merge branch 'IAIS-5' into develop