squash with red hat mainline commit