Merge "Fix target parser" into tools_r22.2