27815b8d37a5fd1cdb16d0eab55d37773767f984
Cherry pick old changes from master, and a small whitespace fix.
Languages
C++
99.2%
Python
0.8%
Cherry pick old changes from master, and a small whitespace fix.