[Fixed] Mantis 4290

Change-Id: Ie20a8874985bca8de659ef5dfb0fb76768bbb770
Merge "[Fixed] Mantis 4290" into unstable