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

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