Merge changes I63348ae3,I658ea409 into experimental * changes: Segment mode coding bug. Silenced a few warnings.