Merged v1.9.10.2