Path paths

Ref: 3073

Ref: 2960

Ref: 2496

Ref: 69