simplified interface: do not encode/decode Bitmap
Merge branch 'beta' into beta-ics
Merge branch 'beta-ics' into betayota