Don't break 501c3
Merge branch 'release/1.2.6'