Merged in 3dfea18