D-16638: Use regex validation