merge master into NXP-10359-REINIT-COPY-LIFECYCLE