Merge tag '2.5.3' into develop

2.5.3
Bump version to 2.5.4
Merge branch 'release/2.5.4'