Get previous change to work and disable merged assets when testing.