'nat' branch merge