Merge "vfc adapter authentication bug fix"