Merge upstream to lca2013