Merge "vfc adapter authentication bug fix" into casablanca