Squashed commit of the following:

commit 7ede5f26b75d66b61dfd257e6e89d7691d82f20d
Author: jobinzhang <Jobin.Zhang@YT00189-234.augmentum.com.cn>
Date:   Tue Nov 12 13:59:56 2013 +0800

    d