Release 1.6.39

Added 6055