Updated setup for v1.5.5091.36472