merge in the latest preview