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

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