Fix Cherry-pick Issues