Merge "Fix|change system.repo update logic"