Merge "Fix targetResourceId issue"