Merge "Fix paths rendering issues."