1st wave of stash diff integration
final stash diff merge from motif script work