Pull changes for #1535