Merge branch 'tova' into autoconfig