Merge "Natservice module bug fixes"