fix merge error: use upstream patch 011