FORGE-1814, FORGE-1815: Fixes for null values in components