cherry-pick piojo fix, fix whitespace conflict