#Issue 0613

#Issue 0473

#Issue 0323