Merge "Fix WRAP_CONTENT//WRAP_CONTENT case in NIV."