merge of branch global-nconf