Related to this issue, but with a narrower scope to support adding k3. In some cases k1 and k2 aren't enough. - #2784