Refactoring apply

Created by  pmeunier  on December 25, 2020
6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC
Change contents