It looks like you are ahead of us all, did you find an answer for your question?
This has been flagged as a defect, with target version of 8.7
The bahviour today is controled by the settings in the template for sockets and core.
Let me know if you want more details.
Maybe it would be good if you raise a ticket as well to highlight this is an important one.
Note: Personally i am more than suprised that something like this is still not addressed , also knowing that CLM uses the VGJ/VGP mechanism.