Merge "Delay tasks from IMMS constructor to later phase"