Commit fixes to oldest supported branches, closes #76