Bugfixes and testing

Created by  pmeunier  on July 5, 2022
ZSXJNP7BGC3UR35ORVPFBXXAMDOGK2HPZB3A5JVJXM5HC55GHH3QC
Change contents