Update version to 1.96.3
Merge branch 'rel-1.96.3' into stable
Merge branch 'stable'