sync with upstream
sync with upstream
add missing buildreq
reverting
missed a patch