MP1-4371: Viewport needed to be changed at a different place