Issue #2231513 Fixed 508 compliance