Fix compile error caused by new member variable
Merge remote-tracking branch 'origin/master'