Merge pull request #9764 from eleuzi01/issue-39-backport

[Backport 3.6] Add project and branch detection in shell