#Issue 1623

#Issue 1293