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

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