Merge "Fix linker compilation with timing enabled"