Current work checkpoint. See diff for details.
Glob mod to normalize pattern between Windows & Linux