Merge from master(fix compile errors)