Issue #3546743 by joshua1234511, ronraney, fionamorrison23, richardgaunt: Fix component validation issues