CQ5 component based deployment fix.