various pre 10.1 commits