[shared] Update test
Merge remote-tracking branch 'upstream/master'