[fix] mantis#5857

Change-Id: I270d4434693fa2a971b591bb414ba91c825fd42f
Merge "[fix] mantis#5857" into unstable