1.5.x feature type list backport this time with the right target branch

Sorry about the first tries. Now it should work.