Merge branch 'maint-2.4.0' from github
[ issue1130 ] fixed

Copy pasted telescope reordering from with-abstraction. Would have
been nice to reuse the code, but refactoring the with-checker is
non-trivial.
[ issue1130 ] updated test case
Merge remote-tracking branch 'maint/maint-2.4.0'