Fixed mason component root for custom stubs
format and comment change to discriminate workaround parts of code
Merge branch 'jag/fix-custom-stubs-comproot' into 3.3