References #9634166922694/9634166922696
Fixed #9634166922696