Added nag-wrapper to grid and cleared all wrappers
Merge branch '132'