Added #2562 and #2563
Backend SHA: 521d7dd95293dddbc55090f5eee08ff71046e3f9