#Issue 1253

#Issue 0953