Fixed #2357
Backend SHA: 9d975d20c644556437f287766da49b043d6a7263