#Issue 0473

#Issue 0393

#Issue 0343

#Issue 0313