Integrate the USERINIT changes r75295, r75302 and r75303 from the setup_improvements...