Merge "Change resource claim to sync to avoid resource conflict"