Merged f8e4 from branch v1.55 into v1.60