Merge "Update user id from shortcut constructor"