Some changes to make migration to 3.0 easier
Merge pull request #3514 from mshabunin:compat-24