ORM: latest fix for WM requires 3 separate ORM .js files