downstream changes from @wynlim

downstream changes from @wynlim