Merge remote-tracking branch 'upstream/master' into for-pull-request
checksum change without version up
merge