Fixed #2360
Backend SHA: c5f1fb22782c9764679df70a029a7804a6064ee7