squash this commit into #2969