merge branch 'NG'