MDL-44153 mod_choice: unified @package use