Fix compilation bug.
Merge branch 'next' into sam_3185