Fixing conflicts with the changes from discussion #143

Created by  pmeunier  on December 5, 2020
6T5ULULMRGU5GJ3JQTEH2QFQN5IMP53TYFFXUT5UE6FA6WWFFMFAC
Change contents