Split branch and issue 744 in several branches to ease review : step one
(Generic issue template)