Revert "Merge remote-tracking branch 'soft-3002/master'"

This reverts commit 5b7c499668dcf7ab916f4de8198862e0dde28ff9, reversing
changes made to db9ffbc1f0560cacc1a5557f61eacc4aefddc97e.
Merge remote-tracking branch 'soft-3002/master' (reverted from commit 5b7c499668dcf7ab916f4de8198862e0dde28ff9)
Merge remote-tracking branch 'soft-3002/master' (reverted from commit 5b7c499668dcf7ab916f4de8198862e0dde28ff9) (reverted from commit 6f2e34b97430ae3a0d22ca04a7911a1f9326b95e)