Updating to version 2.5.3.
Merge branch 'release/v2.5.3' into develop