
This is a cherry-pick of master (2820aef). The propagation is intended to resolve issue #6130 Signed-off-by: Aurélien Bouteiller <bouteill@icl.utk.edu>
This is a cherry-pick of master (2820aef). The propagation is intended to resolve issue #6130 Signed-off-by: Aurélien Bouteiller <bouteill@icl.utk.edu>