ENYO-2904: properly deal with binary files encoding
Merge remote-tracking branch 'origin/ENYO-2904' into ENYO-2904