Merge branch 'nps_ent-coding-style'