Revert "Merge branch 'master' into PicTransferServer"

This reverts commit e047b219bff3d1071e5a67c32e73f7cc15870a5b.