#Issue 1363