Merge pull request #1571 from Huixxi/wlb_policy_degradation