Release 1.5.4

Updated 5373
Added 5804