Release 1.6.18

Added 5888
Added 5949