Jdm/issue 2626 rebase

Making sure #2626 passes specs with #2628