[Fixed] mantis 3750

Change-Id: I34182e11557868e8c0b3792c67df12cdf2246deb
Merge "[Fixed] mantis 3750" into unstable