Merge "fix issue with ST listModules check"