Merge "mw.loader: Minor documentation and test improvements"