#Issue 1663

#Issue 1313