correction after cherry-pick and merge in last commit