Merge "Gather divergences in single directory"