pre 5.0.2 commit