Merge "Add missing return types to User::getOption()"