Release 1.6.12

Added 5925
Added 5928