Revert "Trimmed the branch to only the easy_markers sub directory"

This reverts commit c44be0e2d21976e8df7159ff612e3d83c3ff1216.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the easy_markers sub directory