Merge "Register Rollback user callbacks for added users" into qt-dev