Latest changes from Edgeworx and ADLINK

Merged Christopher Guindon requested to merge github/fork/fdesbiens/dec_10_2019_1 into master

Created by: fdesbiens

Merge request reports