avoid triggering issue 13745 in further improvements to come

The goal of this PR is to avoid triggering issue 13745 in further improvements to come. Also PR reduces module interdependencies.