Merge "Multiversion authentication part2"