Pull changes for #1344