Release 1.6.54

Updated 6161
Updated 5008
Added 6167
Added 6166