merged common code
Authored by: Jean-Francois Dockes 2018-02-14
Parent(s): [3c2aaa]
Child(ren): [acbd21]