Merge "Revert^4 "Run module code only after KeyMints receive module info"" into main