Thomas patch with 14

bench: 4510762