Merged v1.6024 to trunk