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

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