Merge branch 'release/1.5.24' into develop
tuning error logging
Merge branch 'release/1.5.25'