merge devel 4357_text_viwer