The purpose of this MR is to merge my last development in master. After this merging this request, I will remove my branches.
This MR: