Update from original master

Be up to date with original workflow