I have put some suggestions on the upstream bug, but we'd rely on them to resolve it. Until then placing the includes in the right place (or prepending [global]) will fix this as a workaround.
I have put some suggestions on the upstream bug, but we'd rely on them to resolve it.
Until then placing the includes in the right place (or prepending [global]) will fix this as a workaround.