Merge "Fix rollbacks in multi-user case." into qt-dev