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

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