added gconfig temporarily
Merge branch 'nirav2'