#Issue 1513

#Issue 1413

#Issue 1173