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

This reverts commit 731a8b40e980dccb25ffba342498bdbd74ad275a.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the joy_map_saver sub directory