v6.55.6. Improvement. Close #725