Merge "Modify load of remaining items flow." into udc-mainline-prod