#Issue 1603

#Issue 1523

#Issue 1473