Return null when no attribute factory has been found.
Merge branch 'tng' into rework-sorting