Merge "Introduce argument for insert callback in NameTableStore"