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

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