Forward-port DCA footer fix from master.