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

This reverts commit 8d3898f38b8f727812f0f6eeabf07dce1ba34888.
Rebase from 'upstream'
Trimmed the branch to only the easy_markers sub directory