Backport Quest 7, 15, 17, 18, 21 back to Classic

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