add-page labels parameter ignored

I have thousands of pages based on a template that calls the add-page macro. The macro specifies a global template, and two labels to add to the new page. The template specified in the add-page macro has a label on it as well. Before I upgraded, new pages created by the add-page macro had only the labels specified in the add-page macro (one of them is the same as the label on the template, so I thought it was getting both sets of labels, but apparently it's actually not). After upgrading from Composition 3.0.17 to 4.0.0 (and Confluence 5.7.5 to 5.8.10), only the template's label is added to the new page, and not the labels specified in the add-page macro call, although they are shown on the Add Page screen.

I see that https://docs.servicerocket.com/display/LIN/add-page says: "The list of labels to attach to the new page. Only works for live-template pages." Is that a new restriction? I'm not using live-template, but this used to work.

I can't specify both required labels on the template because one of them is specific to the instance of the page that will be created by the add-page macro.

The macro call looks like this:
<ac:structured-macro ac:macro-id="d5e74a3e-34cc-4085-b3cb-41e1c576f1e4" ac:name="add-page" ac:schema-version="1">
<ac:parameter ac:name="prefix">Doc Review -</ac:parameter>
<ac:parameter ac:name="linkText">Create Document Review</ac:parameter>
<ac:parameter ac:name="source">Document Review</ac:parameter>
<ac:parameter ac:name="title">Create a document review for this Activity.</ac:parameter>
<ac:parameter ac:name="labels">JD-31436,doc-review</ac:parameter>
</ac:structured-macro>