Fixed all dependencies related to the new modules introduced with issue
6892