Merging activities with regarding user ids works
Merge branch '2.1' of github.com:vanilla/vanilla into 2.1