Fixed signed/unsigned comparison warning
Merge 3.3
merge 3.4