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

This reverts commit d1dbf9b64cdd635e5ad2b79e00ca37d9736eb844.
Rebase from 'upstream' @ version '0.3.20'
Trimmed the branch to only the planning sub directory