Added auto_join field along with registry upgrade step