AW-2112 #comment add validation to features