Fix debugger environment variables initialization

The correct environment variables group wasn't being passed
Merge branch '4.7'
Merge remote-tracking branch 'origin/master' into frameworks