2017-10-26:  FG;  Several fixes, note that it is not yet possible to set variables in bundle-config, as per CSD ticket 19620.