17889, 17898 by mansemino.

Signed-off-by: anuka <david.vas1@gmail.com>