Rename setImageIS to setInputStream and throw any exceptions to the caller
Rename setImageIS to setInputStream
Merge current state of develop in