Revert "revert some commits for the master branch"

This reverts commit 81df8fe6d441da07ba02f927cdfac26f43a1da43.