Squashed commit of the following:

commit 5288db34f1ffa9902a06c60817ac529d16e9b1a1
Author: jobinzhang <Jobin.Zhang@YT00189-234.augmentum.com.cn>
Date:   Tue Nov 12 13:38:42 2013 +0800

    d