Merge "Fixing case where we were not preloading tasks correctly." into mnc-dev