LUGG-139
Merge branch 'nb'