Merge "Trace bitmaps decoding"