Fixes #1465
Better Fixes #1465
Fix merge
Fixes #1476
Proper Fixes #1473, regression caused by rmuller/infomas-asl#16
Fixes #1477
Fixes #1478
Fixes #1480
Fixes #1479