[fixed?] Mantis 4423

Change-Id: Icbbc340398fd7d4ebfab702d038014422e9860b8
Merge "[fixed?] Mantis 4423" into unstable