Resolved conflicts after merge with carbondev branch kk