Merge "merge msg script now detects extensions main files"