Merge "Fix issue with bmpnText"