Merge "Improves how cornercase scenarios are handled:"