Merge branch 'beta-NPL'