Remove NRE
Merge branch 'dev' into background