Fixes #2004 Fixes #2052 Fixes #458 Fixes #633 Fixes #1710 Fixes #1287
mentioned in issue #633 (closed)