Merge "Convert add-module-block and add-toplevel-block." into main