Merge "Use proper margins for NPV plugin and set the offset"