previous cherry pick cut off an important initialization
update support url