Propagate latest gaudi-related changes from master into 2018-patches

Propagate !713 (merged), !682 (merged) (and !679 (merged)), !676 (merged) and !681 (merged) into 2018-patches.