Merge "Use default spans as min spans if the min spans > default spans" into sc-dev