improve merge code
reference top-level classes instead of modules
Merge branch 'c4c.staging' into c4c.dev