Fix for broken build. Pull changes from ruih/master into cbl_master/plugfest36.

Fix for broken build. Pull changes from ruih/master into cbl_master/plugfest36.