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

This reverts commit 36f3a43a60ec63a5983a84a9c869170cdfa45ae9.
Rebase from 'upstream' @ version '1.9.7'
Trimmed the branch to only the joy sub directory