6.x fix merge fedora 3.6.2