Bump up core version
Merge branch 'rel-2.5.104' into stable
Merge branch 'stable'