Fixed dynamic questions for G5, G7 and fixed tests
Merge remote-tracking branch 'origin/development' into development