merged common code
Authored by: Jean-Francois Dockes 2018-04-25
Parent(s): [a5c936]
Child(ren): [39a611]