Backport Quest 456 back to Classic

Signed-off-by: Salja <salja2012@hotmail.de>
Backport Quest 457 back to Classic

Signed-off-by: Salja <salja2012@hotmail.de>