aligned master to 5.9.6 snapshot