Issues #333 (Agenda in BB) #327 (Revert Status)