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

This reverts commit 91ddba4844faa30af0b7502c0f777e663feadd43.
Rebase from 'upstream' @ version '0.3.16'
Trimmed the branch to only the planning sub directory