closing feature #2407 by integrating Aurore's branch directly