3.0-dev1 update 6

Image viewer update