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

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