correct GN_FIRST_ACTIVE
Merge remote-tracking branch 'origin/master'