#Issue 1263