Merge "Copy constraints file and cleanup log vars"