#Issue 0473

#Issue 0463