[fixed] Mantis Bug # 2147

Change-Id: Ibd60cc2647bfe81b518c6afeb3f05ec6269f4ae1
Merge "[fixed] Mantis Bug # 2147" into unstable