Fix system namespace

it contain also merge of master ( sorry to make review harder...maybe merge master directly in git? )