Merge "Change --fastdeploy behaviour"