cherry pick from titan
cherry-pick address fix