Merge "Small validation fix" into main