implement #6563 to merge close #4401