Merge "Update FDN and SDN constants"