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

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