Merge "Ability to handle new artifact server"