Merge "[Bugfix][ZXW-311] add lynq nv config support & merge changes for sihai"