Merge "Fix a few issues with dest-branch and multiples"