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

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