FORGE-893: Better use of UIValidator