Merge "Making LCA structures in sync"