Merge "Outline & Path perf improvements"