#Issue 1483

#Issue 1273