Merge tag '2.5.3' into develop

Bump version to 2.5.3
Update version (testing)
Merge remote-tracking branch 'origin/develop' into release/2.5.4