NOF-Nemesis 1.42

Change-Id: I15f9fcbd2a73fcc289b97ed468bedb25eda1b384