NFR #1171 Adding code support validation messages