Revert "Revert "Merge pull request #3718 from MP2E/lens_4_4_update""

This reverts commit fec81c392f255fed231d13e9ca363632648a05c5.