Reopening of !2608 (merged) which has been reverted in !2627 (merged) due to bug #1034 (closed). Should be revisited preferably in the light of #869 (closed) and !2629 !2628
Reopening of !2608 (merged) which has been reverted in !2627 (merged) due to bug #1034 (closed). Should be revisited preferably in the light of #869 (closed) and !2629 !2628