merged shared code
Authored by: Jean-Francois Dockes 2018-06-14
Parent(s): [b7f6f8]
Child(ren): [7e050b]