Merge pull request #9578 from mikeller/add_custom_box_names