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

This reverts commit e12e5b953fcce7390bef6ce95ed05a83f851b4fd.
Rebase from 'upstream' @ version '1.9.8'
Trimmed the branch to only the joy sub directory