Merge "enforce_permission_counter: Find targets automatically" into main