Implementing NV swap groups
Added compilation ifdef for NV swap groups
Merge branch 'swapgroups' into develop