Major set of changes, pipeline running again
Merging changes