Release 1.6.25

Added 5973
Updated 4542
Added 5974