Fix merge issue from 1.3 branch
1 file changed