fix #6415
Merge commit '5446623f98563fd9038975fb11810d5a70e2d837' into jn/6415