#Issue 0983

#Issue 0843