A GIPS composite must include all fee-paying accounts - if you include non-fee paying accounts you must disclose them. Is this correct, that you are able to include non-fee paying accounts in a composite?

Yes. You can include non-fee paying account with disclosure. but you CAN NOT include non-discretionary accounts…

I think the key for the fee vs. non-fee is recognizing when the question asks if both are REQUIRED in the composite.