#Issue 1613

#Issue 0953