Previous commit 218d622529a45ea215cbf262221a06bc5b693f85 introduces a compile error, so it was reverted by commit db74ada80f4237726e15bd6def873081428a7210. This commit fixed the issue. (cherry picked from commit 05c347fe51c01494ed8110f8f116a01c90205f13)