Merge "Fix method tracing from command-line"