Merge pull request #6285 from JosephTremoulet/LenProp