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

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