Updated setup for v1.5.4991.37326