Merge "Fixed issues in adapter package Issue-Id: SO-141"