[ci skip] Add a proper to string method and clarify the return type for bulk update
Merge remote-tracking branch 'upstream/master'