Merge commit 'c81ca373ee4e485277e11f180d4e46f7da2d0750' * commit 'c81ca373ee4e485277e11f180d4e46f7da2d0750': Fix adapter name change problem.
Merge commit 'c81ca373ee4e485277e11f180d4e46f7da2d0750' * commit 'c81ca373ee4e485277e11f180d4e46f7da2d0750': Fix adapter name change problem.