Merge branch 'nocomponent' into geni-v3