1.5.x feature type list backport

So here is the next try. Sorry didn't read the developer wiki.