Merge/from set direction

Merging from SetDirection master