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

This reverts commit 2724440f623359433c55d6da3b38f4751289a339.
Rebase from 'upstream' @ version '0.3.15'
Trimmed the branch to only the planning sub directory