[fixed] Mantis 4298

Change-Id: I265c378b8f6d16830645c84028ac51d83fe9696e
Merge "[fixed] Mantis 4298" into unstable