Version 0.30.8/0.19.4, and solving conflicts

Created by  pmeunier  on December 3, 2020
TFYJ3P2AJXRWFYSG6MV7SVN6SOKMO2H2YZD7M6PYQJO6KGYBDCOAC
Change contents