Bug#84942 Fix for BoardClasses mashup