Fixed #2360
Backend SHA: 1159fdeac8971f4540aa3b7818d2fc9142fed06d