closes #1860 pending bootstrap resolution