Make c11318729e25b85eec262322c4232123ad5c927f and 8692aecf789dd52f775dca70a2fc3ddd7938b168 on master