8.5 snapshot login window merge