Component branch fix.