Switched to use built in ZigZag
Merge remote-tracking branch 'origin/Dev'