modules dir wasnt being checked because old INIT_TYPE variable was being used. Fixed
Merge branch 'next'