[BUG #7667] refine due to issues regarding includeNoDeps