Resolves: #5596 Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>