As most of you are probably aware, ZWO had a couple of months ago released a new (at least the third iteration now in the last 2 years) style filter drawer that finally has acceptable light leak.
The drawer two versions ago was practically unusable unless you are in a Bortle 1 area, and the fix for it (simply overlapping the curve plate of the filter carrier) was not much better.
This latest version insets the curve plate of the filter carrier so it is flush with the body of the drawer itself. I still won't recommend it for daytime solar use, but appears fine in a borderline Bortle 5 to 6 area at night.
There are two versions of the drawer -- one for 42mm and one for 54mm camera flange.
ZWO has also since released a new EOS adapter that incorporates the new drawer -- except, in their infinite wisdom, only sell the version with the M42 camera flange! They even showed a diagram to a full frame ASI6200 :-) :-). Do these guys actually use their own products? A M42 (hole aperture about 38mm) with a camera whose sensor diagonal is 44mm??! It would vignette horribly even with an f/16 lens.
After staring at diagrams and pictures, I decided to buy the newer EOS with drawer to experiment with. I aready have two of the new style M54 stand-alone filter drawers.
Sure enough, the subcomponents match.
Here is a picture showing the new style stand-alone M54 drawer and the new style EOS filter drawer with the M42 interface. The left is the stand-alone M54 drawer, and the right is the EOS-M42 drawer. Notice the hole sizes.

Here is another look, at the side view.

Notice the bolt holes of the first picture? Light-bulb above head :-).
So, I removed the camera flange (M54) plate from the stand-alone drawer, and replaced the flange plate of the EOS drawer with it :-).
Here it is on my Canon 100L/2.8 setup, with a ASI6200 at the camera end:

With an IDAS HEUIB filter, and a tree 70m away, the Canon lens's focus marking shows this (focused with a ZWO EAF):

So, if you can't wait for ZWO to release a more sensible M54 version of the EOS drawer, you can get these two parts and Frankenstein it yourself:
https://cloudbreakoptics.com/products/new-filter-drawer-for-eos-lens
https://cloudbreakoptics.com/products/new-2-filter-drawer?variant=43595031871737
Chen