Pull c55615cc8 and other pieces of exact back to master