Updated by Lingjun for merge testing.