Improved error messages in case of version incompatibilities. (#2657)
Merge branch 'v1.13.x' into next